Merge "Avoid races in MessageCache::replace()"